From bb483a7127c72a27090ab66f412219218404e959 Mon Sep 17 00:00:00 2001
From: Michael Schumacher <schumaml@cvs.gnome.org>
Date: Mon, 12 Mar 2007 20:58:13 +0000
Subject: [PATCH] applied patch by John Marshall to make babl extensions build
 on Windows.

2007-03-12  Michael Schumacher  <schumaml@cvs.gnome.org>

	* Makefile.am:
	* extensions/Makefile.am: applied patch by John Marshall to make
	babl extensions build on Windows. They do not work yet, though. Fixes
	bug #409957.

svn path=/trunk/; revision=228
---
 ChangeLog              |  7 +++++++
 Makefile.am            |  8 +-------
 extensions/Makefile.am | 24 +++++++++++++-----------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 408fd8c..c42f8e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-12  Michael Schumacher  <schumaml@cvs.gnome.org>
+
+	* Makefile.am: 
+	* extensions/Makefile.am: applied patch by John Marshall to make
+	babl extensions build on Windows. They do not work yet, though. Fixes
+	bug #409957.
+
 2007-03-12  Øyvind Kolås  <pippin@gimp.org>
 
 	* babl/babl-fish.c: (fishing_result_examine), (go_fishing),
diff --git a/Makefile.am b/Makefile.am
index 15590d1..9abfebe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,7 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 
-if OS_WIN32
-extensions=
-else
-extensions=extensions
-endif
-
 SUBDIRS = babl		\
-	  ${extensions}	\
+	  extensions	\
 	  tests		\
 	  docs
 
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index ffcb622..491d667 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -3,14 +3,16 @@
 
 if OS_WIN32
 no_undefined = -no-undefined
+SOsuf=dll
+libbabldlla=$(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION).dll.a
+else
+SOsuf=so
 endif
 
-EXTRA_DIST = $(wildcard *.[ch])
-
-CFILES  = $(wildcard $(srcdir)/*.c)
-SOBJS   = $(subst $(srcdir)/,,$(CFILES:.c=.so))
-
-INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=.so))
+CFILES          = $(wildcard $(srcdir)/*.c)
+SOBJS           = $(subst $(srcdir)/,,$(CFILES:.c=.$(SOsuf)))
+INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=.$(SOsuf)))
+EXTRA_DIST      = $(wildcard *.[ch])
 
 all-local: $(SOBJS)
 
@@ -18,19 +20,19 @@ CFLAGS  += -I $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC
 
 LDFLAGS += -shared
 
-LDADD    = $(no-undefined)
+LDADD    = $(no-undefined) $(libbabldlla)
 
-%.so: %.c
+%.$(SOsuf): %.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD)
 
 # if extension needing external libraries are to be # compiled with this make
 # file, each of them can be added according to the this pattern:
-# extra.so: extra.c
+# extra.$(SOsuf): extra.c
 #	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<  [own compile and link flags]
 
-CIE-Lab.so: CIE-Lab.c
+CIE-Lab.$(SOsuf): CIE-Lab.c
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) $(MATH_LIB)
-#lcms.so: lcms.c
+#lcms.$(SOsuf): lcms.c
 #	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs`
 #############################################################################
 
-- 
2.30.2